Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] x-pack/heartbeat monorepo #38845

Merged
merged 15 commits into from
Apr 18, 2024
Merged

[CI] x-pack/heartbeat monorepo #38845

merged 15 commits into from
Apr 18, 2024

Conversation

pazone
Copy link
Contributor

@pazone pazone commented Apr 10, 2024

Proposed commit message

Use mono repo plugin for xpack/heartbeat

Related issues

https://github.com/elastic/ingest-dev/issues/3072

Screenshots

Logs

default labels

latest run, after merging conflicts: https://buildkite.com/elastic/beats/builds/5957

macos label

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 10, 2024
@mergify mergify bot assigned pazone Apr 10, 2024
Copy link
Contributor

mergify bot commented Apr 10, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @pazone? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 10, 2024

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2024-04-18T09:07:24.601+0000

  • Duration: 13 min 8 sec

Test stats 🧪

Test Results
Failed 0
Passed 3
Skipped 0
Total 3

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@pazone pazone marked this pull request as ready for review April 11, 2024 09:33
@pazone pazone requested a review from a team as a code owner April 11, 2024 09:33
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for raising this!

Left a few asks for fixes, mostly related to findings/bugs discovered in the last 24hrs.

Copy link
Contributor

mergify bot commented Apr 15, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b ci_xpack_heartbeat_monorepo upstream/ci_xpack_heartbeat_monorepo
git merge upstream/main
git push upstream ci_xpack_heartbeat_monorepo

@sharbuz
Copy link
Contributor

sharbuz commented Apr 15, 2024

Hi @pazone , please pay attention to this PR, it looks like there are missed some changes related to NodeJS in the .buildkite/scripts/install_tools.sh and .buildkite/scripts/common.sh files

@dliappis
Copy link
Contributor

dliappis commented Apr 15, 2024

Hi @pazone , please pay attention to this PR, it looks like there are missed some changes related to NodeJS in the .buildkite/scripts/install_tools.sh and .buildkite/scripts/common.sh files

Great comment @sharbuz !

After looking at the scripts you mentioned I think we can skip referencing any of them if:

  • the pipeline defines ASDF_NODEJS_VERSION: 18.17.1 in the env: section.
    This will automatically enable the right node version due to the global pre-command hook.
  • The apt packages are already pre-installed on the base Ubuntu images

We still need to install the elastic/synthetics node package, as shown in https://github.com/elastic/beats/blob/main/.buildkite/scripts/install_tools.sh#L50-L51, but I think it can simply be explicitly added within the command section like:

echo "Install @elastic/synthetics"
npm i -g @elastic/synthetics

before the last list that runs mage.

Do you remember which step(s) need this node package?

dliappis added a commit to dliappis/beats that referenced this pull request Apr 17, 2024
In preparation for the migration to a static
pipeline (elastic#38845), this commit removes the
Buildkite PR Bot trigger for the pipeline.
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 17, 2024
@dliappis dliappis added ci needs_team Indicates that the issue/PR needs a Team:* label labels Apr 17, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 17, 2024
@dliappis dliappis added needs_team Indicates that the issue/PR needs a Team:* label and removed enhancement labels Apr 17, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 17, 2024
dliappis added a commit that referenced this pull request Apr 17, 2024
In preparation for the migration to a static
pipeline (#38845), this commit removes the
Buildkite PR Bot trigger for the pipeline.
@dliappis dliappis force-pushed the ci_xpack_heartbeat_monorepo branch from 2a0f9c6 to ab4fd31 Compare April 17, 2024 16:09
@dliappis dliappis added macOS Enable builds in the CI for darwin testing :Windows labels Apr 18, 2024
@dliappis
Copy link
Contributor

/test

@dliappis dliappis force-pushed the ci_xpack_heartbeat_monorepo branch from 00e75cf to 8fdec96 Compare April 18, 2024 08:08
Copy link
Contributor

mergify bot commented Apr 18, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b ci_xpack_heartbeat_monorepo upstream/ci_xpack_heartbeat_monorepo
git merge upstream/main
git push upstream ci_xpack_heartbeat_monorepo

@dliappis dliappis removed :Windows macOS Enable builds in the CI for darwin testing labels Apr 18, 2024
@dliappis dliappis self-requested a review April 18, 2024 09:48
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM based on build status (see issue description links)

@dliappis dliappis merged commit 0d3a8b6 into main Apr 18, 2024
69 of 79 checks passed
@dliappis dliappis deleted the ci_xpack_heartbeat_monorepo branch April 18, 2024 09:53
@dliappis dliappis added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify labels Apr 18, 2024
mergify bot pushed a commit that referenced this pull request Apr 18, 2024
Use mono repo plugin for xpack/heartbeat

Relates: https://github.com/elastic/ingest-dev/issues/3072

---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit 0d3a8b6)

# Conflicts:
#	.buildkite/scripts/common.sh
#	.buildkite/scripts/setenv.sh
#	.buildkite/x-pack/pipeline.xpack.heartbeat.yml
mergify bot pushed a commit that referenced this pull request Apr 18, 2024
Use mono repo plugin for xpack/heartbeat

Relates: https://github.com/elastic/ingest-dev/issues/3072

---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit 0d3a8b6)

# Conflicts:
#	.buildkite/scripts/common.sh
#	.buildkite/scripts/setenv.sh
mergify bot pushed a commit that referenced this pull request Apr 18, 2024
Use mono repo plugin for xpack/heartbeat

Relates: https://github.com/elastic/ingest-dev/issues/3072

---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit 0d3a8b6)

# Conflicts:
#	.buildkite/scripts/common.sh
#	.buildkite/scripts/setenv.sh
dliappis added a commit to dliappis/beats that referenced this pull request Apr 18, 2024
dliappis added a commit that referenced this pull request Apr 18, 2024
dliappis added a commit that referenced this pull request Apr 18, 2024
Use mono repo plugin for xpack/heartbeat

Relates: https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 0d3a8b6)

---------

Co-authored-by: Pavel Zorin <[email protected]>
Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis added a commit that referenced this pull request Apr 18, 2024
Use mono repo plugin for xpack/heartbeat

Relates: https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 0d3a8b6)
---------

Co-authored-by: Pavel Zorin <[email protected]>
Co-authored-by: Dimitrios Liappis <[email protected]>
dliappis added a commit that referenced this pull request Apr 18, 2024
* [CI] x-pack/heartbeat monorepo (#38845)

Use mono repo plugin for xpack/heartbeat

Relates: https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 0d3a8b6)
---------

Co-authored-by: Pavel Zorin <[email protected]>
Co-authored-by: Dimitrios Liappis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify ci enhancement Team:Ingest-EngProd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants